(Fx_popup_menu): Add `else' to set Vmenu_updating_frame to nil

only if position is nil.

diff --git a/src/macmenu.c b/src/macmenu.c
index a68ff04e405999be242a80133facf169a1bc9273..064cec57486373af3864c764411fd8cd10ee67a5 100644 (file)
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -746,7 +746,8 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 
       XSETFRAME (Vmenu_updating_frame, f);
     }
-  Vmenu_updating_frame = Qnil;
+  else
+    Vmenu_updating_frame = Qnil;
 #endif /* HAVE_MENUS */
 
   title = Qnil;

diff --git a/src/w32menu.c b/src/w32menu.c
index d441d14b2593cf06f67dd07853ba14b56e78f4e3..dfd885eee08140d0106304bb3191f7b6978e32c8 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -738,7 +738,8 @@ cached information about equivalent key sequences.  */)
 
       XSETFRAME (Vmenu_updating_frame, f);
     }
-  Vmenu_updating_frame = Qnil;
+  else
+    Vmenu_updating_frame = Qnil;
 #endif /* HAVE_MENUS */
 
   title = Qnil;